diff --git a/src/e2e_test.cairo b/src/e2e_test.cairo
index 4a7fce0..4b1b1aa 100644
--- a/src/e2e_test.cairo
+++ b/src/e2e_test.cairo
@@ -3,12 +3,12 @@ use core::option::{OptionTrait};
 
 use core::result::{Result};
 use core::traits::{TryInto};
+use governance::execution_state::{ExecutionState};
 use governance::factory::{
     IFactoryDispatcher, IFactoryDispatcherTrait, Factory, DeploymentParameters, DeploymentResult,
 };
 use governance::factory_test::{deploy as deploy_factory};
 use governance::governor::{Config as GovernorConfig};
-use governance::execution_state::{ExecutionState};
 use governance::governor::{Governor, Governor::{to_call_id}};
 use governance::governor::{IGovernorDispatcherTrait};
 use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
diff --git a/src/factory_test.cairo b/src/factory_test.cairo
index 09614f3..efbe344 100644
--- a/src/factory_test.cairo
+++ b/src/factory_test.cairo
@@ -70,6 +70,6 @@ fn test_deploy() {
             proposal_creation_threshold: 100,
         }
     );
-    assert_eq!(result.timelock.get_configuration().delay, 320);
-    assert_eq!(result.timelock.get_configuration().window, 60);
+    assert_eq!(result.timelock.get_config().delay, 320);
+    assert_eq!(result.timelock.get_config().window, 60);
 }
diff --git a/src/timelock.cairo b/src/timelock.cairo
index ea0e0de..7422435 100644
--- a/src/timelock.cairo
+++ b/src/timelock.cairo
@@ -43,7 +43,7 @@ pub trait ITimelock<TContractState> {
     fn get_owner(self: @TContractState) -> ContractAddress;
 
     // Returns the delay and the window for call execution
-    fn get_configuration(self: @TContractState) -> Config;
+    fn get_config(self: @TContractState) -> Config;
 
     // Transfer ownership, i.e. the address that can queue and cancel calls. This must be self-called via #queue.
     fn transfer(ref self: TContractState, to: ContractAddress);
@@ -144,6 +144,7 @@ pub mod Timelock {
             let id = to_id(calls);
             let execution_state = self.execution_state.read(id);
 
+            assert(execution_state.canceled.is_zero(), 'HAS_BEEN_CANCELED');
             assert(execution_state.created.is_zero(), 'ALREADY_QUEUED');
 
             self
@@ -152,13 +153,14 @@ pub mod Timelock {
                     id, ExecutionState { created: get_block_timestamp(), executed: 0, canceled: 0 }
                 );
 
-            self.emit(Queued { id, calls, });
+            self.emit(Queued { id, calls });
 
             id
         }
 
         fn cancel(ref self: ContractState, id: felt252) {
             self.check_owner();
+
             let execution_state = self.execution_state.read(id);
             assert(execution_state.created.is_non_zero(), 'DOES_NOT_EXIST');
             assert(execution_state.executed.is_zero(), 'ALREADY_EXECUTED');
@@ -168,13 +170,13 @@ pub mod Timelock {
                 .write(
                     id,
                     ExecutionState {
-                        created: 0,
+                        created: execution_state.created,
                         executed: execution_state.executed,
-                        canceled: execution_state.canceled
+                        canceled: get_block_timestamp()
                     }
                 );
 
-            self.emit(Canceled { id, });
+            self.emit(Canceled { id });
         }
 
         fn execute(ref self: ContractState, mut calls: Span<Call>) -> Array<Span<felt252>> {
@@ -183,6 +185,7 @@ pub mod Timelock {
             let execution_state = self.execution_state.read(id);
 
             assert(execution_state.executed.is_zero(), 'ALREADY_EXECUTED');
+            assert(execution_state.canceled.is_zero(), 'HAS_BEEN_CANCELED');
 
             let execution_window = self.get_execution_window(id);
             let time_current = get_block_timestamp();
@@ -207,22 +210,22 @@ pub mod Timelock {
                 results.append(call.execute());
             };
 
-            self.emit(Executed { id, });
+            self.emit(Executed { id });
 
             results
         }
 
         fn get_execution_window(self: @ContractState, id: felt252) -> ExecutionWindow {
-            let start_time = self.execution_state.read(id).created;
+            let created = self.execution_state.read(id).created;
 
-            // this is how we prevent the 0 timestamp from being considered valid
-            assert(start_time.is_non_zero(), 'DOES_NOT_EXIST');
+            // this prevents the 0 timestamp for created from being considered valid and also executed
+            assert(created.is_non_zero(), 'DOES_NOT_EXIST');
 
-            let configuration = (self.get_configuration());
+            let config = self.get_config();
 
-            let earliest = start_time + configuration.delay;
+            let earliest = created + config.delay;
 
-            let latest = earliest + configuration.window;
+            let latest = earliest + config.window;
 
             ExecutionWindow { earliest, latest }
         }
@@ -231,7 +234,7 @@ pub mod Timelock {
             self.owner.read()
         }
 
-        fn get_configuration(self: @ContractState) -> Config {
+        fn get_config(self: @ContractState) -> Config {
             self.config.read()
         }
 
diff --git a/src/timelock_test.cairo b/src/timelock_test.cairo
index ae42b24..596415f 100644
--- a/src/timelock_test.cairo
+++ b/src/timelock_test.cairo
@@ -1,10 +1,8 @@
 use core::array::{Array, ArrayTrait, SpanTrait};
+use governance::execution_state::{ExecutionState};
 use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
 use governance::test::test_token::{deploy as deploy_token};
-use governance::execution_state::{ExecutionState};
-use governance::timelock::{
-    ITimelockDispatcher, ITimelockDispatcherTrait, Timelock, Config
-};
+use governance::timelock::{ITimelockDispatcher, ITimelockDispatcherTrait, Timelock, Config};
 use starknet::account::{Call};
 use starknet::{
     get_contract_address, syscalls::{deploy_syscall}, ClassHash, contract_address_const,
@@ -26,7 +24,7 @@ pub(crate) fn deploy(owner: ContractAddress, delay: u64, window: u64) -> ITimelo
 fn test_deploy() {
     let timelock = deploy(contract_address_const::<2300>(), 10239, 3600);
 
-    let configuration = timelock.get_configuration();
+    let configuration = timelock.get_config();
     assert(configuration.delay == 10239, 'delay');
     assert(configuration.window == 3600, 'window');
     let owner = timelock.get_owner();
@@ -74,7 +72,7 @@ fn test_queue_execute() {
 }
 
 #[test]
-#[should_panic(expected: ('DOES_NOT_EXIST', 'ENTRYPOINT_FAILED'))]
+#[should_panic(expected: ('HAS_BEEN_CANCELED', 'ENTRYPOINT_FAILED'))]
 fn test_queue_cancel() {
     set_block_timestamp(1);
     let timelock = deploy(get_contract_address(), 86400, 3600);