yeah bugs fixed