testing, debugging, styling
fixing js
tweeks and fixes
merging =)