added major updates and implemented bootstrap