some security and cleanup
some fixtures