finished all state methods
fixed bootstrapper to work in any context