Cleaned up, fixed search bug, other stuffs