Added search + more

Added a simple search module.
+ Small changes here and there.