more little things
optomizations!!!