Changed site as requested

Various bug fixes and adjustments

Signed-off-by: Spyros Lefkaditis <slefkaditis@gmail.com>